main: Pick up overridesSchema from sessionMode

This will allow the use of mode-specific defaults. For classic mode
we currently implement this with mini-extensions, but this may result
in confusing behavior when settings change due to extensions being
disabled during screen locks (not to mention that those mini-extensions
are hardly an elegant approach).

https://bugzilla.gnome.org/show_bug.cgi?id=701717

diff --git a/js/ui/main.js b/js/ui/main.js
index d3262ebfe62760f9cfddb992a984cc2ec502fe34..aec10d1e1d91d23e781a23f1bb477b0f4763a97d 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -118,10 +118,9 @@ function _sessionsLoaded() {
 }
 
 function _initializePrefs() {
-    let overridesSchema = 'org.gnome.shell.overrides';
-    let keys = new Gio.Settings({ schema: overridesSchema }).list_keys();
+    let keys = new Gio.Settings({ schema: sessionMode.overridesSchema }).list_keys();
     for (let i = 0; i < keys.length; i++)
-        Meta.prefs_override_preference_schema(keys[i], overridesSchema);
+        Meta.prefs_override_preference_schema(keys[i], sessionMode.overridesSchema);
 }
 
 function _initializeUI() {

diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 4738c2e2922cddb84f397ceb0c7e8ebf027f5c6c..4c849abfbbb900ae21900637748e3cfc430d99a6 100644 (file)
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -16,6 +16,7 @@ const _modes = {
     'restrictive': {
         parentMode: null,
         stylesheetName: 'gnome-shell.css',
+        overridesSchema: 'org.gnome.shell.overrides',
         hasOverview: false,
         showCalendarEvents: false,
         allowSettings: false,